diff --git a/cpu/microblaze/interrupts.c b/cpu/microblaze/interrupts.c
index c0c92ec..dd6a0c7 100644
--- a/cpu/microblaze/interrupts.c
+++ b/cpu/microblaze/interrupts.c
@@ -37,13 +37,11 @@
 void enable_interrupts (void)
 {
 	__asm__ __volatile__ ("msrset r0, 0x2");
-	//microblaze_enable_interrupts ();
 }
 
 int disable_interrupts (void)
 {
 	__asm__ __volatile__ ("msrclr r0, 0x2");
-	//microblaze_disable_interrupts ();
 	return 0;
 }
 
diff --git a/cpu/microblaze/irq.S b/cpu/microblaze/irq.S
index a4e3fbf..393d6e8 100644
--- a/cpu/microblaze/irq.S
+++ b/cpu/microblaze/irq.S
@@ -151,14 +151,7 @@
 	addi	r1, r1, 4
 
 	/* enable_interrupt */
-	addi	r1, r1, -4
-	swi	r12, r1, 0
-	mfs	r12, rmsr
-	ori	r12, r12, 2
-	mts	rmsr, r12
-	lwi	r12, r1, 0
-	addi	r1, r1, 4
-	nop
+	msrset	r0, 2
 	bra	r14
 	nop
 	nop